Small cleanup and bufixes
removed junk