Removed some unusable stuff