Removed unused markups and pegged versions