Adding building degridation feature
Cleaned up warning from unused inports and members