Added logic to remove building method