remove unused/dead code
fix spacing issues