Slowly removing old access system

Slowly removing old access system