Cleaning up unused/unecessary code a bit