Cleanup & removed unnecessary method