Code cleanup, removed unused bits-n-bobs