General clean-up

Reduce visibility, make static, finalize methods/parameters/fields
Remove unnecessary stuff