Code cleanup. Removed unused/unneeded code