Various changes
Trim extra whitespace, remove unused file