Removed unused code, assembly references