some cleaning up because i hated the stuff that's not used