Removed useless stuff, and added building info