More mapping cleanup, got rid of tons of mess code, clean definitions now