Updating code

Removed unused code; changed hierarchy for markers