Cleanup and BaseStation additions