Eliminated unnecessary things..