Removed some bloats