Cleanup methods / annotations

[normanmaurer]

Motivation:

Just some code cleanup related to unused return values and incorrect usage of annotations

Modifications:

• Simplify method as return value was never used
• Remove incorrect usage of @SupressWarnings

Result:

Cleanup