Cleanup of unneeded data and methods
Removed trailing white spaces
Updated changelog for beta2