Minor Fixes - Removed Junk