Remove unnecessary columns from keywords_building table and rewrite related stored procedures to use two joins instead