Removed Libs & Avoided Duplication!