Remove unneeded code
Add floors