get rid of those stupid convenience things i just made