Removed unused code, moved to Area subfolder [skip ci]