Removed some weird functions