Removed some paulirish stuff and switched to mine