Removed & cleaned up